Hi again, I believe I found what the bug was caused by. Please see the attached patch and the comment in the JIRA (http://issues.fluidproject.org/browse/FLUID-3388). Consider this a request for review as well :) Greetings, Boyan