fix issue, ugly as of now, but fixes it