Changing source according to jduck's commit on master