#32 tested and fixed