Bug fixes

just curious, why this change?