missed some tweaks in (#256) sorry :P