fixed for merge