Fixed bug #27
Updated bug #27