Modify behaviour to match platform convention