temp fix until a better one is found