fixed little bug due to merging