BUG: Solves bug with