Fixed bug #46