More mature solution for #4