Fix for white spaces