undid last attempted fix
 trying out mahinders solution to issue 62