fix w/ logging