Another attempt to make it working