fixed object reference errors