* Compilation issue fix