Fixing start and stop behaviour