Testing required, but should resolve #175