Last attempt at fixing #28