Sort of fixes demuz