Merge Issue Fix

I suck at Git, apparently...this should fix merge issues from the last
commit.