Fix #6

This commit fixes issue #6. The new implementation now works fine with 24.3.