Bugfix with add button