Fix for long