One less hack, one more standard (= Fixes #109