Issue 641

Fixes #641 
Sorry to bother, actually I realized it now fires to method calls, any way to move it to js land with an inline check?

cc @adambeynon @meh