Updated unstable branch with hope that it would solve the problem...it did not :(