Did some tests, this might be working now.