Fixing #73

Review needed.

//cc @UltCombo