#113: Fix bug