(#2) add missing change & #4 bugfix