A hacky solution for #190