Improve hybrid mode behaviour