Issue 33

Fixes #76 (regression of the #33)