Fixed a bug with the new -J support