Fix #155 (properly)