fix problem with signals I think