Fixed issue MANORROCKFACES-11