@ChrisArcand's fix