easybe's fix to issue #29