fixes for receiving