fixed Brandon's issue