fixing a couple of problems the decoupling introduced