Follow up to 9a425c1
Special thanks to @MishimaHaruna