updated fix for 1.9.3