Finally fixed strict support