Fixed #252