Fixing Ahmad's bugs.