Fixed bug, still have to account for wildcard chars