Another bugfix, style tweak