an attempt at improving #13