Fix problem in code after merging few commits ago