Temporary solution till I found a better way