applies the fixes #169
helps to commit the fixes #169