Fix for strange merge-bug...