Resolves 157 without changing default behavior