modifications based on issue https://github.com/Tillerino/Tillerinobot/issues/5