Doesn't really involve design changes - just a small bugfix