Tries to fix #888

This is a rather subjective bug :p since it is there, but i am not sure what can be considered a fix of it, there is my first try.