More testing + a temporary soloution