Fixing problems with weird cases