Palliative solution to (#15)