This is better solution for previous fix