merged mrallens fix