Bugfix with quick start