20140509 fixed issues