Fixed the event and commisions bugs