Fix for sloppy coding