minor bugfix + standard compliance