Fix from devins commit