Fix for proper compiling