fixed bugs on EDX-396