Fixes issue28.