This seems to solve #30