Try #1 for fixing build