Another fix for 492