Fixed bug #153