final moment change (hopefully)
Merge pull request #329 from camlspotter/pr

final moment change (hopefully)