Less hacky possible fix