Issue#51

Fix #51