could be fix for bug 1 & 2
taal