Extension: Fix of issue #13

This should fix issue #13 . Please check.