Fixing bugs that were already fixed...?