fix #26 (2d commit)