fixes - tested with 2413s and working