Fix #49

Fix #49