Fixed compilation bug (was only compiling in debug mode)
Merged