0.0.10 Fix for overwrited definitions