Removed unnecessary flush hack