stable: minirefactor #1