Fixing bug that Hironao found (#7)