Should have removed that conditional