fix #28 &