probably fix #34, needs validation