Fix for SITE-491