Potential fix for #314

Let's see if reordering the method calls helps. Looks like voodoo, but couldn't reproduce it since.
Updated CHANGELOG