fixing translate on ff
merging dev