Simplify code after 41ec329