Small fix to make instantaneous work