this would be remove once #975 is merged