Although it may be a better way to handle this case ...