Fix @FireFart's review