Fixed abstraction broken bug