partial fix for #20 still some problems with java & cs