fix martincevic case