fixes some quoting bug
fixes storage issues with Fx 30