updated to recent PR contribution