Fixed #1 since a set dropped methods