WIP: fixing brackets