FIX: reverted recent changes to avoid button issue