fix SHARK-165