Attempt to make it finally work