Fix #55 (related to #57)