Apply Srdjan's patch