More elegant solution for 13.7