More bug found and fixed...