Crappy implementation of a fix to issue #147

This is to enable automatic testing of this proof-of-concept patch and should not be merged as-is, due to being a relatively poor implementation.