KAA #1: Build fix