Implement strict keyword for strict train checking, should fix #2