Fixed build

See commit f588f48 for more details