Fixed #375 and a related dupe