from Cloud9 commit