bugfix
nicer is better