fixing compilation...
Merged