backport commit fcdbafd0c86fdba0830c

fixes issue #26