Fixes: #2073 Fixed some things about POE