Another fix for #96

May be that code will fix issue #96.