Fix again, including lamers this time