Issue#49

Fix #49