Issue #31: Bug fixed