Fix for SHARK-138