This fixes #254 :)