fix for abc7f9a873