Bugfix + graphic