fixed bjarkis mess