Minur bug fix