Fixed issue MANORROCKFACES-7