fix/Fixed bug #28