Fix for issues/485

I fixed my tests, reopening #485