Issue 147

This is a quick solution for #147