fixing delay 'bug'... hopefully for real this time ;)