but still would be nice to have it working in all cases