Fix #30 for realz this time