Fixed issue MANORROCKFACES-2