BS3 compatibility patch