Created a topic, Just works, on the site WordPress.org Forums:
A bit ugly but work like a charm!