Issue 298

This should solve issue #298. I only added one test. no other actions were nessesary.