Another attempt at fixing GitHub issue #30