Temporary fix for skip logic evaluation