Add fix for edge-case have-it-all bug