Fix for a bug