small workaround for the timing problem, will need a proper
implementation later.