fixed a personal mergefail /mattias