Fixed feezing in some cases