[Issue #7] Fixed by 7f27914