Fixed world-button issue