Bugfix add delay