Fixing incomplete merge. #14