Properly fixing #257 and helps out on #324