clean up of fix for issue 1011