more epic fixing