Fixed bug #33