#26 Merge Fix