Fixed bug ZEN-9844