Another attempt at fixing #319