bugfix, polishing