Should fix issue 31 and 32