Fixed #453 and added test cases