#116 fix by comments