#6 - fixing broken build from a2451ed