Fixed functions signature