ticket:13 fixing changes