Fix #2, with amazing commit msg.