Preliminary fix for issue 81