Will file bug. Implement dodgy solution?