Remove if:else because it never fires