Issue 33 fix
extra changes for issue 33 fix