Debug/ams 277

Mindo, potrebuju approve this pull request...