Looks-like we need a minimal delay before this