fixed some issues with jason