TODO fix problems due to merging