issue#394 - resolve issue#394's 1&2 ticket