bug fix [WIP]