Fixes for the issue 76