Fix for minor timing problem