Hopefully this will work on both areas [ci skip]