Trying to fix this with * approach.