Fixes commit ece2323874cde093cee4f325962c2fd85e5cfe0a