Fixed #924 build completely broken