Compatibility with new controls