Bug#49

Fix #49