Better handling of dev edge case.