Fix #57 (hopefully)