Fixed issue MANORROCKFACES-8
Fixed issue MANORROCKFACES-10