We need a better solution for this