[0.7.3-RC1] Fixes #32