Fix for #66 try #2