Fixed issue MANORROCKFACES-4
Fixed issue MANORROCKFACES-5