Revert "Fix #15" because of wrong commit message.

This reverts commit 3816a8ee1ef2157ee2752a46b3309be258adc5fd.
Fix #16