Fix #49

There are some cases where custom messages are used so this wasn't implemented everywhere