Temporary fix with a lot of other mess used for testing