Fix for new installation