buug fix i pimper