Feature/funcblock fix