Fix the only thing I see that could possibly still cause #285