Fixed issue # 15