pseudo-elegance fix xD