trying to clean up @marco1995 's mess