Quick bug fix in