Related to #14
As said, not sure if this is just a bandaid that happens to work or indeed the correct way of doing it.
althonos
