Fixes Fix #28