[#009] A bit better solution for the problem. It has its own assumptions though that should be addressed sometime.