Bugfix for 8238616fd0e52cac6e51ae744b2e974ef6e4b59c (#29)