issues 0000028 and 0000032 resolved