Fixed bug #35