Fixed issue MANORROCKFACES-3