Another BS3 fix