bugfix #8 - Work in progress