Bug found and Fixed