Fix #49