Fixed issue MANORROCKFACES-6