Fixing up edge case nicely =)