Improved hot fix #20