Trying to fix attachment bug