Fix double role methods