Fixing bugs
RC 1