Apply better fix for Atmosphere/atmosphere#1623