Fixed issue MANORROCKFACES-13