#229 and #230 Fixed.