fixes

fixed discussed with Jason