Fixed issue MANORROCKFACES-9