bugfixing & remove receiver