Real fix for the bug

git-svn-id: http://cantata.googlecode.com/svn/trunk@5240 b1e49159-3266-923f-9c3e-04f16369770a