Fixed being too clever