issue 412 bugs fixed