ok this should fix the timing issue. (#36)