Version without awkward bugs.