Fixed a timing issue (probably more like it elsewhere, need to look out for them)