Changed code, because hets bug got fixed. Fixes #164.