GH112 - Solved the before problem