#17 part-baked fix