Fixes #178, fixes ambra bug