Bug found and fixed