Fix static factory method