Apply changes from @mortik