Fix for merge problem