working jblas fix
merge