Fix #25 again
Merge branch 'i25-refix'