Fix #17 hopefully'