merged critical fix from master