reverted changes from PR19