Fixed issue MANORROCKFACES-14