fixed issues due to merging