Fix before and after type check
Merge pull request #556 from alevicki/fix/before_and_after

Fix before and after type check