BUG FIX fixed #47