Fixed issue MANORROCKFACES-12