Fix for a little bug