Fix #184 (properly)