Improved BS3 compatibility