Fixed bug #30
Updated bug #30