Installation bug-fix