More elegant way of doing: 7990c32ad63d087a042842fca8b504da633ff920