bugfix, formatting