Fix and minor method signature improvement