montgomery fix (temporary)