Additional code for fix #26