Fix for Combat log indicator

This tries to fix issue #32. Haven't been tested yet.

Don't mind the branch name...