Fix #54