Fixed bug introduced in commit:be5a4b3f6b3a0488cd02dbd05f9c7e64da2a7e8b and resolve #1