Only way I could see this was failing. Fix #17