Fixing merge problem with with commit 34c97cd, where my changes got overwritten