tags 1228 - fixed pending
tags 1540 - fixed pending
thanks