Fixing my mistakes...