fixed unexpected issue introduced by last commit