Bugfix, formatting