BUGS FIXED