#116 Fixed bug