We should find a solution for this