Version 3.0.4 [JB]