Fix issue #122

All are :green_heart: 

Please review my patch!