Changes #352